Fixed argument list and return type for non-XIM fallback.

Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

 	* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
 	list and return type for non-XIM fallback.

 	* configure.in: Only build XIM-support if available.

diff --git a/ChangeLog b/ChangeLog
index d42a8ee051ad33cb2d7811d7ed23247197e37a95..effe3e29fc2295de6428a3bf78b88f9320a86c2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+ 
+       * gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
+       list and return type for non-XIM fallback.
+ 
+       * configure.in: Only build XIM-support if available.
+ 
 Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
        
        * gtk/testselection.c (main): Add in missing 'flags'

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d42a8ee051ad33cb2d7811d7ed23247197e37a95..effe3e29fc2295de6428a3bf78b88f9320a86c2e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+ 
+       * gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
+       list and return type for non-XIM fallback.
+ 
+       * configure.in: Only build XIM-support if available.
+ 
 Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
        
        * gtk/testselection.c (main): Add in missing 'flags'

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d42a8ee051ad33cb2d7811d7ed23247197e37a95..effe3e29fc2295de6428a3bf78b88f9320a86c2e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+ 
+       * gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
+       list and return type for non-XIM fallback.
+ 
+       * configure.in: Only build XIM-support if available.
+ 
 Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
        
        * gtk/testselection.c (main): Add in missing 'flags'

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d42a8ee051ad33cb2d7811d7ed23247197e37a95..effe3e29fc2295de6428a3bf78b88f9320a86c2e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+ 
+       * gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
+       list and return type for non-XIM fallback.
+ 
+       * configure.in: Only build XIM-support if available.
+ 
 Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
        
        * gtk/testselection.c (main): Add in missing 'flags'

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d42a8ee051ad33cb2d7811d7ed23247197e37a95..effe3e29fc2295de6428a3bf78b88f9320a86c2e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+ 
+       * gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
+       list and return type for non-XIM fallback.
+ 
+       * configure.in: Only build XIM-support if available.
+ 
 Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
        
        * gtk/testselection.c (main): Add in missing 'flags'

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d42a8ee051ad33cb2d7811d7ed23247197e37a95..effe3e29fc2295de6428a3bf78b88f9320a86c2e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+ 
+       * gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
+       list and return type for non-XIM fallback.
+ 
+       * configure.in: Only build XIM-support if available.
+ 
 Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
        
        * gtk/testselection.c (main): Add in missing 'flags'

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d42a8ee051ad33cb2d7811d7ed23247197e37a95..effe3e29fc2295de6428a3bf78b88f9320a86c2e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+ 
+       * gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
+       list and return type for non-XIM fallback.
+ 
+       * configure.in: Only build XIM-support if available.
+ 
 Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
        
        * gtk/testselection.c (main): Add in missing 'flags'

diff --git a/README.cvs-commits b/README.cvs-commits
index cc90ee9810930174659c173541fd37ecf9593804..12231d72b6c5eb46452733dd0fc14a3f5a01656e 100644 (file)
--- a/README.cvs-commits
+++ b/README.cvs-commits
@@ -43,6 +43,17 @@ Notes:
 * If you are going to be changing many files in an experimental fashion,
   it probably is a good idea to create a separate branch for your changes.
 
+* The ChangeLog entries should preferrably match in date format
+  with the existing entries. You can set how emacs does this
+  by using customize mode:
+
+  - M-x customize
+  - set Programming/Tools/ChangeLog/Add Log Time Format to
+    'Old Format'
+
+ Or, set the add-log-time-format to 'current-time-string in
+ your .emacs file.
+
 Owen Taylor
 13 Aug 1998
 

diff --git a/config.h.in b/config.h.in
index 03bb8ec8bab8816f446e12d6feeed7bbc50c4122..364037f42ad521f65930db60c2e6fd146fd1a17d 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -59,3 +59,6 @@
 
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
+
+/* Define if you have the X11 library (-lX11).  */
+#undef HAVE_LIBX11

diff --git a/configure.in b/configure.in
index 1c8f0494c021b1e7145e582a4e1362eeee770b37..33aed8789a80bfc7da0a4ee9de3bd79e6f5211d9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]]
                    , enable_ansi=no)
 AC_ARG_WITH(glib, [  --with-glib=DIR         Use uninstalled copy of glib])
 AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],
-                       echo $enable_xim, enable_xim="yes")
+                       , enable_xim="yes")
 AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])
 
 AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
@@ -163,10 +163,6 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
     CFLAGS=$gtk_save_CFLAGS
     AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
 
-if test "x$enable_xim" = "xyes"; then
-  GTK_XIM_FLAGS="-DUSE_XIM"
-fi
-
 if test x$with_glib = xyes ; then
   AC_MSG_ERROR([
 *** Directory must be specified for --with-glib])
@@ -273,6 +269,17 @@ AC_CHECK_LIB(X11, XConvertCase,
       ,
       $x_libs)
 
+# Check for XIM support.
+
+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
+           ,
+           enable_xim=no,
+           $x_libs)
+
+if test "x$enable_xim" = "xyes"; then
+  GTK_XIM_FLAGS="-DUSE_XIM"
+fi
+
 x_cflags="$X_CFLAGS"
 x_ldflags="$X_LDFLAGS $X_LIBS"
 

diff --git a/gdk/gdkim.c b/gdk/gdkim.c
index 235cc5e8d27bc3b2089daaa3e6ced094534680a4..b12aebd9d3d26484934f1cfe8695c3cbbc81c716 100644 (file)
--- a/gdk/gdkim.c
+++ b/gdk/gdkim.c
@@ -1317,10 +1317,8 @@ gdk_im_ready (void)
   return FALSE;
 }
 
-GdkIC 
-gdk_ic_new (GdkWindow* client_window,
-           GdkWindow* focus_window,
-           GdkIMStyle style, ...)
+GdkIC * 
+gdk_ic_new (GdkICAttr *attr, GdkICAttributesType mask)
 {
   return NULL;
 }
@@ -1346,14 +1344,16 @@ gdk_ic_get_values (GdkIC *ic, ...)
 {
 }
 
-void 
-gdk_ic_set_attr (GdkIC *ic, const char *target, ...)
+GdkICAttributesType 
+gdk_ic_set_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
 {
+  return 0;
 }
 
-void 
-gdk_ic_get_attr (GdkIC *ic, const char *target, ...)
+GdkICAttributesType 
+gdk_ic_get_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
 {
+  return 0;
 }
 
 GdkEventMask 

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 235cc5e8d27bc3b2089daaa3e6ced094534680a4..b12aebd9d3d26484934f1cfe8695c3cbbc81c716 100644 (file)
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -1317,10 +1317,8 @@ gdk_im_ready (void)
   return FALSE;
 }
 
-GdkIC 
-gdk_ic_new (GdkWindow* client_window,
-           GdkWindow* focus_window,
-           GdkIMStyle style, ...)
+GdkIC * 
+gdk_ic_new (GdkICAttr *attr, GdkICAttributesType mask)
 {
   return NULL;
 }
@@ -1346,14 +1344,16 @@ gdk_ic_get_values (GdkIC *ic, ...)
 {
 }
 
-void 
-gdk_ic_set_attr (GdkIC *ic, const char *target, ...)
+GdkICAttributesType 
+gdk_ic_set_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
 {
+  return 0;
 }
 
-void 
-gdk_ic_get_attr (GdkIC *ic, const char *target, ...)
+GdkICAttributesType 
+gdk_ic_get_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
 {
+  return 0;
 }
 
 GdkEventMask